many: fix swapping back and forth between kernels with components during remodeling #15046
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
Needs Documentation -auto-
|
Wed Feb 19 18:32:08 UTC 2025 Failures:Preparing:
Executing:
Restoring:
|
andrewphelpsj
force-pushed
the
remodel-fix-kernel-swapping
branch
from
88ba090 to
f9f7070
Compare
github-actions
bot
removed
the
Needs Documentation -auto-
andrewphelpsj
added
the
Run nested
pedronis
reviewed
Feb 13, 2025
overlord/snapstate/snapstate.go
Outdated
Comment on lines
3444
to
3448
| // this previously created a prepare-kernel-snap task, but this was not | ||
| // needed since this function is only used to swap to kernel snaps that | ||
| // are still installed on the system (but not in use. this can happen | ||
| // because remodeling leaves around old snaps). if the snap is | ||
| // installed, then it is expected that the drivers tree is present. |
There was a problem hiding this comment.
it feels some of this needs to go into the doc comment for (Add)LinkNewBaseOrKernel as it's actually not super clear what their exact usage conditions are
pedronis
reviewed
Feb 14, 2025
overlord/snapstate/snapstate.go
Outdated
| @@ -3492,8 +3503,24 @@ func findSnapSetupTask(tasks []*state.Task) (*state.Task, *SnapSetup, error) { | |||
| return nil, nil, nil | |||
| } | |||
|
|
|||
| // AddLinkNewBaseOrKernel creates the same tasks as LinkNewBaseOrKernel but adds | |||
| // them to the provided task set. | |||
| // LinkNewBaseOrKernel appends tasks to a given task set. This enables swapping | |||
andrewphelpsj
force-pushed
the
remodel-fix-kernel-swapping
branch
from
cf19dea to
0e52fb7
Compare
…nkNewBaseOrKernel and snapstate.AddLinkNewBaseOrKernel
…led kernel during remodel
andrewphelpsj
force-pushed
the
remodel-fix-kernel-swapping
branch
from
0e52fb7 to
82bdecb
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #15046 +/- ##
==========================================
+ Coverage 78.07% 78.12% +0.05%
==========================================
Files 1182 1174 -8
Lines 157743 157753 +10
==========================================
+ Hits 123154 123248 +94
+ Misses 26943 26857 -86
- Partials 7646 7648 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Comment on lines
+121
to
+130
| "${NESTED_FAKESTORE_BLOB_DIR}" \ | ||
| ./pc-kernel-efi-pstore+efi-comp.comp | ||
|
|
||
| restore: | | ||
| systemctl stop fakedevicesvc | ||
| "${TESTSTOOLS}/store-state" teardown-fake-store "${NESTED_FAKESTORE_BLOB_DIR}" | ||
|
|
||
| execute: | | ||
| echo 'Swap to the first new kernel and component pc-kernel-mac80211-hwsim+wifi-comp' | ||
| gendeveloper1 sign-model < "${SECOND_MODEL_JSON}" > second-model.assert |
There was a problem hiding this comment.
nitpick: tabulation is inconsistent in the different parts of this yaml file. I think we tend to use 2.
Comment on lines
-50
to
-51
| # Just so that nested_prepare_kernel does not recopy the old one | ||
| cp "${kernel_snap_file}" "${NESTED_ASSETS_DIR}/pc-kernel.snap" |
There was a problem hiding this comment.
why is this not needed anymore?
Comment on lines
+181
to
+183
| // TODO: it seems that removing this line doesn't break any tests | ||
| expected = append(expected, tasksBeforeDiscard...) | ||
|
|
There was a problem hiding this comment.
But this is getting added by this PR, should not then just be removed? Not sure if I am missing something here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes and tests the case where we remodel to a kernel snap that is already installed on the system, but is not the current kernel due to a previous remodel.
Note that this PR removes the existing "prepare-kernel-snap" task from the created tasks here, because the task is superfluous in this case. The kernel's drivers tree is already generated from the original installation of the kernel.